Take widget y offset into account when positioning the popup. (#314470,

2005-08-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenutoolbutton.c (menu_position_func): Take widget
	y offset into account when positioning the popup.  (#314470,
	Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index b786eb087a7f0dfbb24d1288862200b53f1bba80..55eb8d14fcd5d38bdb87841fd7bfd4db8c661e51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenutoolbutton.c (menu_position_func): Take widget
+       y offset into account when positioning the popup.  (#314470,
+       Christian Persch)
+
 2005-08-25  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkscreen.c (gdk_screen_get_type): Use gdk_screen_init

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b786eb087a7f0dfbb24d1288862200b53f1bba80..55eb8d14fcd5d38bdb87841fd7bfd4db8c661e51 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmenutoolbutton.c (menu_position_func): Take widget
+       y offset into account when positioning the popup.  (#314470,
+       Christian Persch)
+
 2005-08-25  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkscreen.c (gdk_screen_get_type): Use gdk_screen_init

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 12e1aec08f2c297877a5e683dff51fc43a174d75..856a4f15d2fbf23c9e77e5ed45b0db7422384014 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -307,6 +307,7 @@ menu_position_func (GtkMenu           *menu,
     {
       gdk_window_get_origin (widget->window, x, y);
       *x += widget->allocation.x;
+      *y += widget->allocation.y;
 
       if (direction == GTK_TEXT_DIR_LTR)
        *x += MAX (widget->allocation.width - menu_req.width, 0);